Start the drag before focusing the selected.day. Stop a beginning drag if

Thu Jun 10 00:36:15 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcalendar.c (gtk_calendar_main_button): Start
	the drag before focusing the selected.day.
	* gtk/gtkcalendar.c (gtk_calendar_state_changed): Stop
	a beginning drag if the widget becomes insensitive.

diff --git a/ChangeLog b/ChangeLog
index 2f8eea5de841e2ca93c71bdae9353308445fc90c..7c8c435fa77815efab2477f7cc82a1c3a17bfc40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jun 10 00:36:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_main_button): Start 
+       the drag before focusing the selected.day.
+       * gtk/gtkcalendar.c (gtk_calendar_state_changed): Stop
+       a beginning drag if the widget becomes insensitive.
+
 Thu Jun 10 00:09:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcalendar.c (gtk_calendar_button_press): Start 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2f8eea5de841e2ca93c71bdae9353308445fc90c..7c8c435fa77815efab2477f7cc82a1c3a17bfc40 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu Jun 10 00:36:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_main_button): Start 
+       the drag before focusing the selected.day.
+       * gtk/gtkcalendar.c (gtk_calendar_state_changed): Stop
+       a beginning drag if the widget becomes insensitive.
+
 Thu Jun 10 00:09:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcalendar.c (gtk_calendar_button_press): Start 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2f8eea5de841e2ca93c71bdae9353308445fc90c..7c8c435fa77815efab2477f7cc82a1c3a17bfc40 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu Jun 10 00:36:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_main_button): Start 
+       the drag before focusing the selected.day.
+       * gtk/gtkcalendar.c (gtk_calendar_state_changed): Stop
+       a beginning drag if the widget becomes insensitive.
+
 Thu Jun 10 00:09:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcalendar.c (gtk_calendar_button_press): Start 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2f8eea5de841e2ca93c71bdae9353308445fc90c..7c8c435fa77815efab2477f7cc82a1c3a17bfc40 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu Jun 10 00:36:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcalendar.c (gtk_calendar_main_button): Start 
+       the drag before focusing the selected.day.
+       * gtk/gtkcalendar.c (gtk_calendar_state_changed): Stop
+       a beginning drag if the widget becomes insensitive.
+
 Thu Jun 10 00:09:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcalendar.c (gtk_calendar_button_press): Start 

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 544775c1ae7c7e92131b0cdf50b6d8112e4ec2d4..331f3fe4bc4032a744bd312c2c6d910858b096ae 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -1024,11 +1024,11 @@ gtk_calendar_main_button (GtkWidget      *widget,
       if (!GTK_WIDGET_HAS_FOCUS (widget))
        gtk_widget_grab_focus (widget);
          
-      gtk_calendar_select_and_focus_day (calendar, day);
-
       private_data->in_drag = 1;
       private_data->drag_start_x = x;
       private_data->drag_start_y = y;
+
+      gtk_calendar_select_and_focus_day (calendar, day);
     }
   else if (event->type == GDK_2BUTTON_PRESS)
     {
@@ -3084,7 +3084,10 @@ gtk_calendar_state_changed (GtkWidget       *widget,
   private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
   
   if (!GTK_WIDGET_IS_SENSITIVE (widget))
-    stop_spinning (widget);    
+    {
+      private_data->in_drag = 0;
+      stop_spinning (widget);    
+    }
 
   for (i = 0; i < 4; i++)
     if (GTK_WIDGET_IS_SENSITIVE (widget))